| commit | 6296e800dab9c259314c6e80ad246850abfc4c0b | [log] [tgz] |
|---|---|---|
| author | Jack Yu <jackyu@google.com> | Sat Aug 05 16:46:36 2017 -0700 |
| committer | Jack Yu <jackyu@google.com> | Sat Aug 05 16:47:10 2017 -0700 |
| tree | 4f15d4a7ac1a509cf18f2bbbfda1d0cd4b1b83ab | |
| parent | 40c722c9afd2fc4d450ac2ae882d07f6c1bf781f [diff] | |
| parent | 6ad6c38986e8cdb336d0a27342f1864f85134332 [diff] |
resolve merge conflicts of 6ad6c3898 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Merged-In: I413711c4af6374609f87f5aad63eb1a09fd22655 Change-Id: I5bb62539336cd983ed1bc7a2f8427e2cea2f1bc3