| commit | b40756ac2872351a4232615c680db94636fd7962 | [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 | 0ea7c975affc0ccb82ca3ac89bc63b4ac2374b92 [diff] | |
| parent | 50cb973b49ad5a180d80feaa49f9e55be0745b37 [diff] |
resolve merge conflicts of 50cb973 to stage-aosp-master Change-Id: Idf0d02687cc47f64acfdd3da623c7a7a62043651