| commit | 83fca03d080b88d5ecda75f6c5b5a1f44fa25d8f | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Oct 02 21:05:26 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 21:05:26 2012 -0700 |
| tree | c4377c747fc45b0660ace355f1f77dc32c333ac7 | |
| parent | c914b5bf5224f2d5fcc24026c35c2e4ffd7588d7 [diff] | |
| parent | 5150b1f770301f5359c07da1be5ce0fdaf342ba9 [diff] |
am 5150b1f7: am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800 * commit '5150b1f770301f5359c07da1be5ce0fdaf342ba9': DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800