commit | 1f9debfe9c23b1fc4c5f9ddb34d646e434759944 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:15:57 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:15:57 2012 -0700 |
tree | c6b6c1199c7eaf5c1bfa0ac72edee4a69b4a126f | |
parent | 23025ecdc0890e9262951627defda77e621fd9e8 [diff] | |
parent | 8f456399e710f0349b8857e3dcf8f097a33dcba7 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I694692df8c4b28b047f7da606799687320474c99