| commit | 3c1ded16643352abe1a17dd0fc53db3436df8256 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 12 07:36:27 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 12 07:36:27 2012 -0800 |
| tree | e337d4162fd2c137d5585e21fcf6d1c231d88b7c | |
| parent | 2331b42328fcdd54d3b26152f998554c610ae1b4 [diff] | |
| parent | e08791c8318216b7934742681edfab57b8147d78 [diff] |
am e08791c8: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'e08791c8318216b7934742681edfab57b8147d78':