commit | 15e47193a78a260d87f820d6845d49ddaf5c91a1 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:22:31 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:22:31 2013 -0700 |
tree | cd18c5265b9663cd9390c92677ad60356b502b98 | |
parent | 3a9a72639f3196d23b5c79022229e290249c9089 [diff] | |
parent | f8b53182ef88a5b0deaf1eb1d717152279f33280 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I7dc6218e1103d9bbf789d66a70d344cb4b43c0fc