Scott Main
9d1bdcb5f1
am 8a37395f: remove redirect for guide/index.html now that we actually have such a page
...
* commit '8a37395f3a623cbd7d0c65de911c3d4e8d1002a2':
remove redirect for guide/index.html now that we actually have such a page
2014-01-18 02:21:27 +00:00
Alan Viverette
bd983a1509
am 375047c5: am 1c85b25a: am 802b3257: am b9dcf851: am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
...
* commit '375047c56ccb3d489094d1f1e3fd6f6f9021ade9':
Update DrawerLayout demo code to use title API
2014-01-17 22:47:05 +00:00
Alan Viverette
375047c56c
am 1c85b25a: am 802b3257: am b9dcf851: am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
...
* commit '1c85b25ab17a63da474aee89f39949ee9e03b8a4':
Update DrawerLayout demo code to use title API
2014-01-17 14:45:40 -08:00
Alan Viverette
1c85b25ab1
am 802b3257: am b9dcf851: am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
...
* commit '802b3257de47f94b2a36da8d9ddd92cd89bade38':
Update DrawerLayout demo code to use title API
2014-01-17 22:41:51 +00:00
Alan Viverette
802b3257de
am b9dcf851: am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
...
* commit 'b9dcf8517443abc671c44cf3e629c623b7713bf1':
Update DrawerLayout demo code to use title API
2014-01-17 22:39:48 +00:00
Alan Viverette
b9dcf85174
am f75b531f: Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
...
* commit 'f75b531f71a66daedd846f807a4008806bd37c21':
Update DrawerLayout demo code to use title API
2014-01-17 14:34:31 -08:00
Alan Viverette
f75b531f71
Merge "Update DrawerLayout demo code to use title API" into klp-ub-dev
2014-01-17 22:32:41 +00:00
Alan Viverette
13b90285ed
Update DrawerLayout demo code to use title API
...
BUG: 12460402
Change-Id: Id3873bf850f4fac67593c86be9aa2e9e1adb78ba
2014-01-17 10:54:15 -08:00
Alan Viverette
b4db807bdb
am 40ac3d01: am 928962b7: am 057e870f: am c2c96e2e: am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
...
* commit '40ac3d01bb31315206b3cede4aeb5fee4f12ef6f':
Revert "Update DrawerLayout demo code to use title API"
2014-01-17 06:04:38 +00:00
Alan Viverette
40ac3d01bb
am 928962b7: am 057e870f: am c2c96e2e: am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
...
* commit '928962b775cb637e270763c25982d328d0e9545b':
Revert "Update DrawerLayout demo code to use title API"
2014-01-16 22:02:32 -08:00
Alan Viverette
928962b775
am 057e870f: am c2c96e2e: am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
...
* commit '057e870f5133c2aef4b33dee7d4397ca0845dc62':
Revert "Update DrawerLayout demo code to use title API"
2014-01-17 06:00:26 +00:00
Alan Viverette
057e870f51
am c2c96e2e: am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
...
* commit 'c2c96e2e6237c83b2e7383a1d9553b8d004f8a33':
Revert "Update DrawerLayout demo code to use title API"
2014-01-17 05:58:13 +00:00
Alan Viverette
c2c96e2e62
am ae03a0c3: Revert "Update DrawerLayout demo code to use title API"
...
* commit 'ae03a0c38df9e669ecc45230830df64a5f30a139':
Revert "Update DrawerLayout demo code to use title API"
2014-01-16 20:28:02 -08:00
Alan Viverette
ae03a0c38d
Revert "Update DrawerLayout demo code to use title API"
...
Dependency isn't upstreaming properly, so reverting until it does.
This reverts commit eddc182fce .
Change-Id: Ic80e0a4b8f8289524828684bbcf836e210182ba9
2014-01-17 04:25:22 +00:00
Alan Viverette
99159fbf4a
am 1c08deef: am 3c44c2a2: am 69335b8f: am eae40e99: am eddc182f: Update DrawerLayout demo code to use title API
...
* commit '1c08deefa65cfbc248540f89b1ed07d02fb81691':
Update DrawerLayout demo code to use title API
2014-01-17 01:14:21 +00:00
Alan Viverette
1c08deefa6
am 3c44c2a2: am 69335b8f: am eae40e99: am eddc182f: Update DrawerLayout demo code to use title API
...
* commit '3c44c2a2b461caff314ab5a6e55314d8801b5178':
Update DrawerLayout demo code to use title API
2014-01-16 17:11:36 -08:00
Alan Viverette
3c44c2a2b4
am 69335b8f: am eae40e99: am eddc182f: Update DrawerLayout demo code to use title API
...
* commit '69335b8fe54e40dfa86447b87ab12983060cd14b':
Update DrawerLayout demo code to use title API
2014-01-17 01:06:43 +00:00
Alan Viverette
69335b8fe5
am eae40e99: am eddc182f: Update DrawerLayout demo code to use title API
...
* commit 'eae40e9945ef7b94c4e36834c0912eaba20fc3e3':
Update DrawerLayout demo code to use title API
2014-01-16 23:47:39 +00:00
Alan Viverette
eae40e9945
am eddc182f: Update DrawerLayout demo code to use title API
...
* commit 'eddc182fce572a688ad38295a6afccdfbf5335e8':
Update DrawerLayout demo code to use title API
2014-01-16 15:42:30 -08:00
Alan Viverette
eddc182fce
Update DrawerLayout demo code to use title API
...
BUG: 12460402
Change-Id: I3c740e571d487ae3edbb3607eaa335e92f3770ce
2014-01-16 14:53:19 -08:00
Andy Hung
17b6a3137e
Handle IOException from MediaCodec factory methods
...
Bug: 1136427
Change-Id: I411a341b551454ee3bd1215e3c6f5572d1555675
Signed-off-by: Andy Hung <hunga@google.com >
2014-01-16 14:02:05 -08:00
Yuhao Zheng
12f62196c5
Add opt/net/wifi/service to eclipse .classpath
...
bug: 12175455
Change-Id: I49df46a1b87822d6cae87b5ed716040e3b6803b7
2014-01-16 10:27:25 -08:00
Andrew Hsieh
5a28b08b85
am 9beb5da3: am a131dee4: am 0f69afed: am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit '9beb5da33a889ae1cdab553a487c72b0f5cc0e5f':
Fix headers to be inclued alone
2014-01-16 17:23:00 +00:00
Andrew Hsieh
ec01bd3bfb
am 400ac261: am be13dbd7: am de53375f: am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit '400ac2616ecb15cf8961a68d733bb20284b4166e':
Fix typo in comments in looper.h
2014-01-16 17:22:59 +00:00
Andrew Hsieh
a2ef514b62
am 83bd985e: am 470ec2be: am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '83bd985ec66d25e4d11abc60f02f00c4ecc2c7c4':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:22:58 +00:00
Andrew Hsieh
9beb5da33a
am a131dee4: am 0f69afed: am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit 'a131dee4976d32ab79b8bdb92cae2d790a119990':
Fix headers to be inclued alone
2014-01-16 09:20:27 -08:00
Andrew Hsieh
400ac2616e
am be13dbd7: am de53375f: am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit 'be13dbd7b8a4fa3b98cdc1f87ab04082feef064b':
Fix typo in comments in looper.h
2014-01-16 09:20:26 -08:00
Andrew Hsieh
83bd985ec6
am 470ec2be: am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '470ec2be44ad2bed606ec9cdd7dcbdfc56de1b89':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 09:20:25 -08:00
Andrew Hsieh
a131dee497
am 0f69afed: am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit '0f69afedc212d49a4141a953302f1a165c1316c8':
Fix headers to be inclued alone
2014-01-16 17:17:30 +00:00
Andrew Hsieh
be13dbd7b8
am de53375f: am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit 'de53375f23faa38684ca6045067a2e797760f655':
Fix typo in comments in looper.h
2014-01-16 17:17:29 +00:00
Andrew Hsieh
470ec2be44
am 0423f030: am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '0423f030642f78d0e107b3c43b75b0ff11fc2e3e':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:17:28 +00:00
Andrew Hsieh
0f69afedc2
am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit 'b14ac43dbd37c9519b339a99468b1d4a38ec2ce4':
Fix headers to be inclued alone
2014-01-16 17:14:39 +00:00
Andrew Hsieh
de53375f23
am f991c547: am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit 'f991c5478e8d82e1aa76c1c0a5f813cd5716e171':
Fix typo in comments in looper.h
2014-01-16 17:14:38 +00:00
Andrew Hsieh
0423f03064
am 28c9c34d: am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '28c9c34d8670266add371e9f0f33e4da52a024f4':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 17:14:37 +00:00
Andrew Hsieh
b14ac43dbd
am ca34e29d: Merge "Fix headers to be inclued alone"
...
* commit 'ca34e29d94056bfc20b6b9ea8b36b41763acfe61':
Fix headers to be inclued alone
2014-01-16 09:09:58 -08:00
Andrew Hsieh
f991c5478e
am 42bb3bca: Merge "Fix typo in comments in looper.h"
...
* commit '42bb3bcadc1611efa2632e83eb5d094f60b82263':
Fix typo in comments in looper.h
2014-01-16 09:09:57 -08:00
Andrew Hsieh
28c9c34d86
am 6d2d58de: Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
...
* commit '6d2d58de54169cd2cae9dbf3f69bd52af87daae5':
Fixed asset_manager.h, rect_manager.h, and jni.h
2014-01-16 09:09:56 -08:00
Andrew Hsieh
ca34e29d94
Merge "Fix headers to be inclued alone"
2014-01-16 17:03:03 +00:00
Andrew Hsieh
42bb3bcadc
Merge "Fix typo in comments in looper.h"
2014-01-16 17:02:47 +00:00
Andrew Hsieh
6d2d58de54
Merge "Fixed asset_manager.h, rect_manager.h, and jni.h"
2014-01-16 17:02:36 +00:00
Santos Cordon
5c67ce0ba1
resolved conflicts for merge of 17bfc712 to master-nova-dev
...
Change-Id: I26fb365b5c937bd1758e951eceac2eef5c0323de
2014-01-15 15:24:55 -08:00
Amith Yamasani
17bfc71291
am a7244cfc: am 52cf96e9: Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
...
* commit 'a7244cfc93edb8dabc35f258ec828e358d61befa':
Update eclipse classpath due to change in directory structure
2014-01-15 14:11:41 -08:00
Amith Yamasani
a7244cfc93
am 52cf96e9: Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
...
* commit '52cf96e9aa650ff50a0a25924e81bec35be56c4f':
Update eclipse classpath due to change in directory structure
2014-01-15 22:08:57 +00:00
Amith Yamasani
52cf96e9aa
Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev
2014-01-15 22:06:55 +00:00
Andrew Hsieh
2c8776805a
Fix headers to be inclued alone
...
See b.android.com/64679 for one of header sys/prctl.h
Change-Id: Ie415ebe2086d2f0190d84fba0c57cc7e1e5822ae
2014-01-13 12:58:46 +08:00
Santos Cordon
70939ca364
Adding telecomm-unit alias for running telecomm tests with runtest.
...
Change-Id: I52ff6845e69a5989e34b0c506e0ae677c7d8aa01
2014-01-10 21:19:02 +00:00
Andrew Hsieh
66febb3347
am 02f789fb: am bee62e6e: am 926d852a: am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '02f789fb4e7bac9f79ca9c0db29a246e0c7e0196':
Implement wait4 already exist in header
2014-01-10 02:00:30 +00:00
Andrew Hsieh
02f789fb4e
am bee62e6e: am 926d852a: am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit 'bee62e6e924c6e5f44511d5523467f549e95c12b':
Implement wait4 already exist in header
2014-01-09 17:57:49 -08:00
Andrew Hsieh
bee62e6e92
am 926d852a: am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '926d852a5b838f0faa632839c31c4274e93cf200':
Implement wait4 already exist in header
2014-01-10 01:54:30 +00:00
Andrew Hsieh
926d852a5b
am 1c9e7361: am 3517e742: Merge "Implement wait4 already exist in header"
...
* commit '1c9e736166ee6d00962360d1a41a840862346562':
Implement wait4 already exist in header
2014-01-10 00:41:31 +00:00