| commit | f6771f631b814189d83b9b16cfa73d1466f932af | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:32:28 2014 -0700 |
| committer | Ed Heyl <edheyl@google.com> | Mon Jul 14 23:32:28 2014 -0700 |
| tree | ef17465cb774620b1fc8f1f40e925345ed2979e2 | |
| parent | 4f892ab728798dab39812e2dcf38bec5b2a112ea [diff] |
reconcile aosp (8689b90bcfdc92c94475901935b5f6efae0c9abc) after branching. Please do not merge. Change-Id: I0e4c55cc5a04d4593c3cd200c08c48d18c08a161