commit | 8f4011b16ab6b04ab8e8889967b2f5622ae4d057 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Sep 26 10:07:34 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 10:07:34 2012 -0700 |
tree | abd7a4e2008548f3dbb693c2065779e1593c67e1 | |
parent | 97bb5a9f987c40ea2ae82cfd7d46aec23735e998 [diff] | |
parent | e08bbe5b6d1d5db8f057c840773b435f869384cd [diff] |
am e08bbe5b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e08bbe5b6d1d5db8f057c840773b435f869384cd':