| commit | 9969f53e25b5cc884a2a2dffac66405eac3aaaa2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 20 15:48:33 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 20 15:48:33 2012 -0800 |
| tree | e3b9588f238adb6891f108acc4718c03b39b5065 | |
| parent | 592e8ae01d106b0c82c07ea93cf4e842ea40d8a6 [diff] | |
| parent | a6d8ed11803f311b5adc14c6aeeb80d00e319770 [diff] |
am a6d8ed11: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'a6d8ed11803f311b5adc14c6aeeb80d00e319770':