| commit | bb40eab34a5eded59eab171b36cd9667ccf030a3 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 20 15:48:35 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 20 15:48:35 2012 -0800 |
| tree | fc9a2bfebc358e6fa45c4c218c0ab3e28b154604 | |
| parent | f9b6e097cba2346c416d4c31dad5549703c963c3 [diff] | |
| parent | 8f7ac8caa62326d28a50c9aeb037a805eda661f1 [diff] |
am 8f7ac8ca: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '8f7ac8caa62326d28a50c9aeb037a805eda661f1': JDP81