| commit | 2154560baa276b9cb683b671d126464a4731d37e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 21 11:57:10 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 21 11:57:10 2013 -0700 |
| tree | 3f7f5191582c8b703dbf2076123810dc626b740a | |
| parent | e317f85282ab9ac300dae7ee5bb39d55ff04fbf9 [diff] | |
| parent | 7b458857604ad49ba8a2cecc738a534089f6b244 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I21300451f36b39b57e18be0c53503f03dba49648