| commit | 20ba503c12101e21e073223f1ba2d89db378eb13 | [log] [tgz] |
|---|---|---|
| author | tturney <tturney@google.com> | Tue Nov 08 11:27:20 2016 -0800 |
| committer | tturney <tturney@google.com> | Tue Nov 08 11:27:20 2016 -0800 |
| tree | 7f3c69aa0adfc2891880cfe6023c5353721e488f | |
| parent | 54d971b99b91adbe66fb415c5470e4d413193667 [diff] | |
| parent | bd9689bf9b27660c4e02ca2ee0bd00b36d639bb4 [diff] |
resolve merge conflicts of bd9689b to stage-aosp-master Change-Id: Iefb78d0f3c46f10aff0773ecca6861f7f48e09bd