commit | 76be17de7a7fc811da0145252855802d06d55367 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 12 07:27:32 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 12 07:27:32 2013 -0700 |
tree | df8f3b0b7df5e526bb0833683245a3d30cb615f4 | |
parent | 032ad0542b395d1277b634b1243f36ae2100eb16 [diff] | |
parent | 4e9b763cf2ee10f83a798f3a0794bbd72b3826c8 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I5f92acba878b1d0f149df1499cc09f3cda23f7e3