| commit | ae454082c601dcf0da6203146340f71d532cf2fb | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Oct 02 21:11:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 21:11:20 2012 -0700 |
| tree | a6007eb0320cd5cfbc682871091593dcf65cb4eb | |
| parent | a9334f275226ca70cd2af2409e65383b03c76af1 [diff] | |
| parent | b41d19c9abe98b59b095e2722993ed96ee287748 [diff] |
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 'b41d19c9abe98b59b095e2722993ed96ee287748': DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800