| commit | 2694c6a594fc3165121480b474dee919749e406b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jun 16 20:47:25 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Thu Jun 16 20:47:25 2016 -0700 |
| tree | 187dc5ae554eb2afa79d1b59643473ae5dc221cf | |
| parent | 6f25ce204f57a9eec9c514e5fa19ccdf8489cafd [diff] | |
| parent | 55caa152389df351ba0737f5b5d1163c5c37463b [diff] |
resolve merge conflicts of 55caa15 to stage-aosp-master Change-Id: I5fdab7ea6b35331c5bd6c1e56e226d78d4a5b52a
