commit | fa4abe86376af761484a6f88c222a2ab64c893ac | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:54:23 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri May 17 12:54:23 2013 -0700 |
tree | ce71e2f08fb1e23e908aac6127c275e8ac2fb2aa | |
parent | d7f1ae6fce80523731ce138e79855ad098d56d0c [diff] | |
parent | 0fe63cd4fbf2450ddff237d2a65eb982f9423162 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: I56c9305bd508afe439e38c7a05aa4b9139ed28f1