| commit | 6f1cbaf08f6dc3545afdd622cf3d1b315e84a517 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Dec 07 03:02:00 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Dec 07 03:02:00 2016 +0000 |
| tree | 08f1020a777d508a659371454d2a7f7193e883e1 | |
| parent | d918dfbcd76b522bf065ed79d8f96205bcd0ba88 [diff] | |
| parent | c2faf5d56bc76c3fd9546178362fd74f7b6a782f [diff] |
Merge "resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777 am: 47feeee8ee am: 838049884f am: 713068d06e" into nyc-mr2-dev-plus-aosp