| commit | a06ead01a7a0cd93ca9e5389f6905da24d457a74 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:36:59 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Jun 06 10:36:59 2013 -0700 |
| tree | 26ad7d5c3055c4ddf1735dd855dd8d22d2b4fc85 | |
| parent | 40eb3e9affb21c76c5381311f88b161ad9a5a1d0 [diff] | |
| parent | 262b13458572eb9ec585dcb423ac01a9aaff5f87 [diff] | |
| parent | e37a14650671e0efca365e83ef029e6f308d9c5c [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I2a27565cdfdadb8e9045e720d9691ea58ed89bae