| commit | b41d19c9abe98b59b095e2722993ed96ee287748 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Oct 02 21:09:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 21:09:30 2012 -0700 |
| tree | 1dfbf4cd426266469ede8f741bd12d8601de06bf | |
| parent | 6190ac593ab0188acc274ef40504bd71c2a76e27 [diff] | |
| parent | e41404f496002a24f670f6c16f3fbae07b10ce3e [diff] |
am e41404f4: am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800 * commit 'e41404f496002a24f670f6c16f3fbae07b10ce3e': DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800