| commit | 8dc3833e832c6d8e7ec5c689070adab4788b126a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Sep 24 10:01:32 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Sep 24 10:01:32 2015 -0700 |
| tree | 5625fcbc2fee196421ea7a5073a4d7a105451a7f | |
| parent | 06a45679aafe971d7ab8dbfc4cdd70376d9d7f83 [diff] | |
| parent | aa49801a929f21d6e6e305b875f4108ce4963f25 [diff] |
resolved conflicts for a884d81e to stage-aosp-master Change-Id: Ice485967fa96f13786024b6939b826638e906ff0