commit | a45398078e4f798a34310a2d5213e07eefb14238 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 13 08:22:42 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 13 08:22:42 2013 -0700 |
tree | c04a7333f15e86d260c4c207a9fd06cd23d2b195 | |
parent | a1d73d9be0beafd10642d6db0136b16353a32096 [diff] | |
parent | 9ad5d03e99e3b1b5297ff0cc8a8dfda5bc705e64 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: Id9419bf573d550f1ebebcc96fe615e1aaf8f36ef