commit | f85f4a21f9a5691f6248b41237031325465c5895 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 14 12:33:03 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 14 12:33:03 2013 -0700 |
tree | d78773ce21bc3f05cd95c4bfd784c1f1daaabaa6 | |
parent | 4accc1fe021321ecfe504897ed45121f11e6bd4b [diff] | |
parent | c09485a09c29f1dbc47f96c6bf36d047c293abed [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I57ada5cdfa6a6ecb82014096f09dce224859ba1c