| commit | a168a83a8940eea54ee66bb7610a63ce49c67874 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Oct 02 21:07:40 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 21:07:40 2012 -0700 |
| tree | 1dfbf4cd426266469ede8f741bd12d8601de06bf | |
| parent | 868346827c5e1f5939c3669ee24c75da4489181e [diff] | |
| parent | c914b5bf5224f2d5fcc24026c35c2e4ffd7588d7 [diff] |
am c914b5bf: (-s ours) am 142158bd: am 6eb95f1a: (-s ours) DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73 * commit 'c914b5bf5224f2d5fcc24026c35c2e4ffd7588d7': DO NOT MERGE cherypick from jb-dev Change-Id: Ifcae4fcf716c8bb48f3ff18f17313b3f131c3f73