| commit | d47ba649b09f0af0fec0abfe38bffe464dae8473 | [log] [tgz] |
|---|---|---|
| author | Justin Yun <justinyun@google.com> | Thu Aug 02 18:21:06 2018 +0900 |
| committer | Justin Yun <justinyun@google.com> | Thu Aug 02 18:21:06 2018 +0900 |
| tree | 68493c5d86945c5247f092a53542d60407e1dbb8 | |
| parent | 61a5c1fe0130576702621ef7ae0113541486c7b4 [diff] | |
| parent | 24ccc4021c9228e0d3d1670c8ec57bc989921e65 [diff] |
Merge QPR1.180718.001 Conflicts: Android.mk Change-Id: I39f5a061c758c8e467cc8f25ba2957911dcdbb62