commit | 37dc9a20f045436ef9ff8a15f70eda746f411ab4 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 06 10:46:43 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 06 10:46:43 2012 -0800 |
tree | 6568ce3f980efa2bee35092eaf880fe62bf52329 | |
parent | 7d091828d937fd7895a20026a81fec9981ad0717 [diff] | |
parent | 1e34606fffc5194bb852ec40c950e79ba7435797 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I487fc4f0fc8050e6f59985a25ad7add411a97a78