| commit | 1dd320ea93698e38be2bae8f618b76334153cd8c | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Tue Aug 23 10:24:46 2016 -0700 |
| committer | Chris Craik <ccraik@google.com> | Tue Aug 23 10:24:46 2016 -0700 |
| tree | f3525a3f752d834bfdc19fd2ca3f6004562e3aa7 | |
| parent | b3406c933aa20f6e46f7f91007da8b9514e9e8cb [diff] | |
| parent | 31898546df75e23ada32189f22a51495ab154447 [diff] |
resolve merge conflicts of 3189854 to stage-aosp-master Change-Id: Ia445d8ecf85ce655862194a21b322457c38471ee