| commit | 838ac37536c79c8e627b9dba862b341da8974136 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Jan 31 23:31:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 31 23:31:26 2017 +0000 |
| tree | 43381406b927ad0b1e121d36fb50e30c47a1f5cb | |
| parent | b8dfd40f52c5a9641f8f4c59e444a96c4348d338 [diff] | |
| parent | 444d5607de49f37e2437556bcd66db9888d1a1ce [diff] |
Merge to upstream r293166. am: 467bf41d66 am: 444d5607de Change-Id: Id4afc32692cbd67eea2f16353c2c4d5c6d6eb1f1