commit | 6c72c1877fadca5068fa94f7a0249c0609e85534 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 10 08:13:42 2013 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Mon Jun 10 08:13:42 2013 -0700 |
tree | 777d5acd68cfa82a0f55ebbd7844f0897e545b1a | |
parent | 574ca4f4f15a42d6159150149f68bf3cb800d869 [diff] | |
parent | 98be7e0f1da2d77c502dba5f135476bc6f04c29a [diff] | |
parent | 6f02c174a6ffcf9acbb272bd7ba3bb6f83dc856d [diff] |
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge Change-Id: I9864de7c2785357cea0c4b669607fee76e9f09e8