| commit | 242f2c6e3284ee128cc6977a4677b29bb89272ee | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Oct 02 21:12:51 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 21:12:51 2012 -0700 |
| tree | 5de2d4ab19179ec41de0482ad9f7689eb1912f79 | |
| parent | 8ce5b7e4deb0e62eb402aa508d68e4d4418d2602 [diff] | |
| parent | ae454082c601dcf0da6203146340f71d532cf2fb [diff] |
am ae454082: (-s ours) am b41d19c9: am e41404f4: am 83fca03d: (-s ours) am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800 * commit 'ae454082c601dcf0da6203146340f71d532cf2fb': DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800