commit | 4b0cebb4939aa4431f8d0c607db3a8f3424e2a84 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 10 10:05:56 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 10 10:05:56 2013 -0700 |
tree | 30c6b888f0be22304740d05aea1c9f2f1abad0ea | |
parent | 9fdf3868aa4f1fdc7295759e24a0c7498ee98c60 [diff] | |
parent | 65e6966389ca535cb0aaadeb7316600cf53bdef1 [diff] |
Reconcile with jb-mr2-release - do not merge Change-Id: Ic2d8fb42f01f3d9ffeeffd2b0a02bc3ddbad2ed7