| commit | 5150b1f770301f5359c07da1be5ce0fdaf342ba9 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Oct 02 21:04:28 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 02 21:04:28 2012 -0700 |
| tree | 3c87cfc3f069a65925e0b7b33bb3257b39d30a50 | |
| parent | 142158bd218421741d6d133e9ebbb1203ae6e6a6 [diff] | |
| parent | f3d0104a8039af22daab02a914c6639fe078c9a6 [diff] |
am f3d0104a: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800 * commit 'f3d0104a8039af22daab02a914c6639fe078c9a6': DO NOT MERGE cherrypick from jb-dev Change-Id: Iaab2b30349943a236607d54394019fa8d89de800