| commit | a9334f275226ca70cd2af2409e65383b03c76af1 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Oct 02 21:11:19 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 21:11:19 2012 -0700 |
| tree | a6007eb0320cd5cfbc682871091593dcf65cb4eb | |
| parent | c9dcdae58b9026b4a2100ce86442b891c9f77beb [diff] | |
| parent | 6190ac593ab0188acc274ef40504bd71c2a76e27 [diff] |
am 6190ac59: am a168a83a: am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73 * commit '6190ac593ab0188acc274ef40504bd71c2a76e27': DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73