| commit | b6f845895decc75e10ee399d1c1addaf38c0a871 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 18 11:50:32 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 18 11:50:32 2013 -0700 |
| tree | bb0ebf447053281177c9899a4e37e26435b2808a | |
| parent | 8bf01cd3510cf86661b3ce83b009d458556b0a98 [diff] | |
| parent | 61b7f7e51655fa071d528e8b4e82766907a4f1f8 [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I15e9b02a55ce4d6a46afed52a732f3bbcf8e8470