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