commit | d6d5cbb02a263bb8b5ae9e3721b3ee80575c110a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:40:29 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:40:29 2012 -0800 |
tree | 1cc6e998dd041b2583e107b97d5549c6195ff6b6 | |
parent | 9ea86011a2c379b58df8c5b92efddf6764a57084 [diff] | |
parent | 5115d4348ee720be3db77ae54a06c492049e5ea3 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Ib3c4bb83421360add15219251a389d25f1211497