| commit | 6d448deff729dc6fc5909e07335f2eb67ebcb713 | [log] [tgz] |
|---|---|---|
| author | tturney <tturney@google.com> | Fri Jun 24 08:46:18 2016 -0700 |
| committer | tturney <tturney@google.com> | Fri Jun 24 08:46:18 2016 -0700 |
| tree | 3d5270ce3ca57036eecb2cab876cd8dd31f88fcc | |
| parent | 6935e52e55b6c579eddcb3fdbed60381aff5c237 [diff] |
[DO NOT MERGE ANYWHERE] Reset branch to aosp staging Something went horribly wrong which results in constant merge conflicts. This is an attempt to fix this intermediate branch to avoid rediculous merge conflicts in the future. Change-Id: I52a3173658f9239166f5dbfaeae1be0f30649fd3