| commit | 142158bd218421741d6d133e9ebbb1203ae6e6a6 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Oct 02 21:03:18 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 21:03:18 2012 -0700 |
| tree | 3c87cfc3f069a65925e0b7b33bb3257b39d30a50 | |
| parent | f5878b3ea31a04d13888f14bd652340da8a38437 [diff] | |
| parent | 6eb95f1ac83a02a7bdb68cdcc5a09e7079ff46c0 [diff] |
am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73 * commit '6eb95f1ac83a02a7bdb68cdcc5a09e7079ff46c0': DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73