| commit | 94bd0218c538cde3df191c28dff7159ba0aeecba | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Sep 30 09:08:23 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Sep 30 09:08:23 2016 -0700 |
| tree | 4e762adc8d2ef50a571aad536e22b61525d1d37f | |
| parent | aa565eb4521a66d92884a9c08d5a894db4a3b6cd [diff] | |
| parent | ed8e40d5e722ef334df2672794a5636a174f0829 [diff] |
resolve merge conflicts of 50cb973 to stage-aosp-master Change-Id: Idf0d02687cc47f64acfdd3da623c7a7a62043651