Commit graph

12494 commits

Author SHA1 Message Date
The Android Automerger
1709f39a72 JWR16B 2013-04-16 15:17:49 -07:00
The Android Automerger
9165c3f695 "JWR16" 2013-04-16 05:56:35 -07:00
The Android Automerger
1e0ee1f249 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-16 05:55:06 -07:00
The Android Automerger
4c7ab87dc9 JWR15B 2013-04-15 16:39:23 -07:00
Dirk Dougherty
befd7fe6e7 am 7f8fd3b1: am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '7f8fd3b1333084f9e291a1948d6ef73daeccbc70':
  Doc change: css for policy docs.
2013-04-15 15:51:22 -07:00
Dirk Dougherty
7f8fd3b133 am 7098897f: am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '7098897fecff6ec586a078025676b8203ab2060d':
  Doc change: css for policy docs.
2013-04-15 15:47:08 -07:00
Dirk Dougherty
7098897fec am 53facc05: am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '53facc05af437f0721646102442c61c49b2e33be':
  Doc change: css for policy docs.
2013-04-15 15:44:44 -07:00
Dirk Dougherty
53facc05af am 4f425e42: am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '4f425e4284024e21c7e65a7840d8e1a45d916756':
  Doc change: css for policy docs.
2013-04-15 15:41:54 -07:00
Dirk Dougherty
4f425e4284 am 48732d9a: am bec14294: Doc change: css for policy docs.
* commit '48732d9aaa765576d98f07fabd856a17528cb826':
  Doc change: css for policy docs.
2013-04-15 15:37:54 -07:00
Dirk Dougherty
48732d9aaa am bec14294: Doc change: css for policy docs.
* commit 'bec142949a33bf7d195d022e9ec99a1a84197065':
  Doc change: css for policy docs.
2013-04-15 15:34:05 -07:00
The Android Automerger
920ac0436a "JWR15" 2013-04-15 05:57:31 -07:00
The Android Automerger
27dbdd21f2 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-15 05:55:22 -07:00
The Android Automerger
9ab7e9575b JWR11G 2013-04-12 18:15:42 -07:00
The Android Automerger
f17a20322b JWR11F 2013-04-12 16:20:46 -07:00
The Android Automerger
cfe9beb6cb JWR11E 2013-04-12 14:32:07 -07:00
The Android Automerger
b70ec9e1e5 JWR11D 2013-04-12 11:30:53 -07:00
The Android Automerger
3ebe68c899 "JWR11C" 2013-04-11 23:22:16 -07:00
Dirk Dougherty
bec142949a Doc change: css for policy docs.
Change-Id: I5d8609d7e20315e5bb022f057704b2814ad9e172
2013-04-11 21:48:54 -07:00
Jeff Sharkey
021aa4cefe Merge "DO NOT MERGE. Fix build by removing old file." into jb-mr2-dev 2013-04-12 00:12:01 +00:00
Jeff Sharkey
90baef427e DO NOT MERGE. Fix build by removing old file.
Change-Id: I2fb4d27acfabb9283d54958f0438a6db74641dd2
2013-04-11 17:09:56 -07:00
Ying Wang
14ae6e87c9 Merge "Get rid of the liblog hack." into jb-mr2-dev 2013-04-11 22:56:20 +00:00
The Android Automerger
e31a2fdfc0 JWR11B 2013-04-11 14:44:38 -07:00
The Android Automerger
3099d895c9 "JWR11" 2013-04-11 05:57:18 -07:00
The Android Automerger
677af3fb34 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-11 05:55:15 -07:00
Ying Wang
3e55609134 Support to dist unbundled files for bundled build
Usage:
LOCAL_DIST_BUNDLED_BINARIES := true
The dist files will include the jni shared libraries and the apk with
jni libraries stripped.

Bug: 8181626
Change-Id: I4a047d786ad35b948b4ad7a51adf37321dbe395c
2013-04-10 22:06:02 -07:00
The Android Automerger
a1b904a349 JWR10C 2013-04-10 19:07:13 -07:00
Ying Wang
fea1ffeff3 Get rid of the liblog hack.
Bug: 8580410
Change-Id: I3ece860673eb52a2db1421db4492c9b1807dda6e
2013-04-10 17:34:57 -07:00
Ying Wang
c04a828222 Revert "Get rid of the liblog hack."
This reverts commit 7636578729

Change-Id: I32f2acce5f99cb97eae986dfeba6d5d25378aefa
2013-04-10 22:11:43 +00:00
The Android Automerger
f1a7e1393e JWR10B 2013-04-10 12:18:38 -07:00
The Android Automerger
604ffe96de "JWR10" 2013-04-10 05:57:46 -07:00
The Android Automerger
077f8e5704 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-10 05:55:19 -07:00
Ying Wang
7636578729 Get rid of the liblog hack.
Bug: 8580410
Change-Id: I4b437d10522ee66c7883faacfaf7e30abede394c
2013-04-09 23:27:57 -07:00
Ying Wang
8c431c157d Add liblog
Bug: 8580410
Change-Id: Id3c26ff084950f8cbfa87f4425747ee322de7624
2013-04-09 22:33:58 -07:00
Ying Wang
fd068148d6 Merge "Revert "Add liblog"" into jb-mr2-dev 2013-04-10 05:32:37 +00:00
Ying Wang
cd3190a9f5 Revert "Add liblog"
This reverts commit 8722580d90

Change-Id: Iafdbb7f540a53ddc9dc2e21c0afddb62c44c4af8
2013-04-10 05:32:21 +00:00
Ying Wang
134ec88c94 Merge "Add liblog" into jb-mr2-dev 2013-04-10 05:12:00 +00:00
Ying Wang
8722580d90 Add liblog
Bug: 8580410
Change-Id: I45e17b786b8d221a071b5de2432bb1367e245fb4
2013-04-09 21:41:48 -07:00
The Android Automerger
bd1b6ab4c2 JWR09C 2013-04-09 16:00:25 -07:00
Robert Ly
e26c63bedd am 645c6887: am 7b0422e5: am 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates
* commit '645c6887287c78590eabd8c8f2d7486bfda32544':
  s.a.c templates
2013-04-09 13:43:50 -07:00
Robert Ly
645c688728 am 7b0422e5: am 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates
* commit '7b0422e5ba911b8864ed89e76698f9d332732d77':
  s.a.c templates
2013-04-09 13:40:36 -07:00
Robert Ly
7b0422e5ba am 969c4c0c: am b6b3da3c: am a4d2d0ef: s.a.c templates
* commit '969c4c0c3c0d24d00bb27606de477f4c0cfc24fc':
  s.a.c templates
2013-04-09 13:37:01 -07:00
Robert Ly
969c4c0c3c am b6b3da3c: am a4d2d0ef: s.a.c templates
* commit 'b6b3da3c9a095167b0257903234960aac9e80ebb':
  s.a.c templates
2013-04-09 13:33:28 -07:00
Robert Ly
b6b3da3c9a am a4d2d0ef: s.a.c templates
* commit 'a4d2d0ef551f443445a1dffb05f530de32b01fb3':
  s.a.c templates
2013-04-09 13:29:57 -07:00
Robert Ly
a4d2d0ef55 s.a.c templates
Change-Id: Ia6554ba55d10af10227cde336026b51a27307aa0
2013-04-09 11:27:34 -07:00
The Android Automerger
b36d3033d0 JWR09B 2013-04-09 10:05:04 -07:00
The Android Automerger
ce37594337 "JWR09" 2013-04-09 05:57:13 -07:00
The Android Automerger
6d61aa3218 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-09 05:55:14 -07:00
The Android Automerger
eacd415f5e JWR08B 2013-04-08 18:53:50 -07:00
Dianne Hackborn
51ebc822c1 Merge "Add new media command to build." into jb-mr2-dev 2013-04-08 22:35:35 +00:00
The Android Automerger
8db145f199 "JWR08" 2013-04-08 05:58:37 -07:00