| commit | 4d2f024df613dcd10bc589449a14ac918b65a35f | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Wed Oct 26 23:13:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 26 23:13:58 2016 +0000 |
| tree | 2f0175d0ee4549495e645a64b581f59750e092f8 | |
| parent | ace2fea3b0a3b6fa040fe1fd40dc1768927cc7b7 [diff] | |
| parent | a905c234da0dc7cb3558ad6846c902ba7c68d9c3 [diff] |
resolve merge conflicts of d20fe45 to stage-aosp-master am: a905c234da Change-Id: I7406c544bdb2a0ffa545640bc6a4e56acbd4e1ef