| commit | b9f5c914a818d91c8eebc51d35672ca6ee2763db | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Nov 12 07:31:13 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 07:31:13 2012 -0800 |
| tree | 8d84df712c39dca5169096aa596cbec6fa0f40ab | |
| parent | 30055612a3442771b9856cbfac4dcd657c1ea857 [diff] | |
| parent | b263fd97087ef7aba761397246124e4fcf3a4f2f [diff] |
am b263fd97: am 3253b263: Reconcile with jb-mr1-release - do not merge * commit 'b263fd97087ef7aba761397246124e4fcf3a4f2f':