OSDN Git Service

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230d...
authorPhil Weaver <pweaver@google.com>
Wed, 19 Jul 2017 00:05:08 +0000 (00:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 00:05:08 +0000 (00:05 +0000)
commit533c1efbc7a51d1b4adbd1e6af9180424392e735
tree57330f8d37f8f3b9322145d9a817b5db85d890c6
parent6fee9a5e9193d1236597c74f2a729de21895f15e
parent2b8694c33d5ac3ce8c59fcf13e9ddba930933c37
Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18  -s ours
am: 2b8694c33d

Change-Id: Icef5847bf3eaf4c9fdce6eaaff1d642828f89477