| commit | 73f6ffd175bf59bb11eef9e73f546cf65b355b45 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 28 00:32:31 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 00:32:31 2012 -0700 |
| tree | 44bcce495cb9b4e5865b481b41ef3e884b721726 | |
| parent | 0f8afa4b79649f1b5c818910cfb854c21c04cb75 [diff] | |
| parent | 31dab5994aac66e7e9bbe47ccaa399997d5b2d95 [diff] |
am 31dab599: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '31dab5994aac66e7e9bbe47ccaa399997d5b2d95':