| commit | 22c24868fb0c14caee6b77adc0a1198408b438ff | [log] [tgz] |
|---|---|---|
| author | Jae Shin <jaeshin@google.com> | Fri Sep 15 15:34:02 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Sep 15 15:34:02 2017 +0000 |
| tree | 10fac06c171fc688f0a405d7e772787bf44e5acf | |
| parent | 8eb0656e5d6740176c976ad8b0346303df20a04b [diff] | |
| parent | dc97d46e145ce96497be824337fcf88e13b3ee1d [diff] |
resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master am: 0ed84e3e91 Change-Id: I6d9fc1a64b90d52cd71c25313aa63949300e4112