OSDN Git Service

Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb...
authorPhil Weaver <pweaver@google.com>
Tue, 18 Jul 2017 21:43:53 +0000 (21:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 21:43:53 +0000 (21:43 +0000)
commit3099a7f79426f03b06f22ec37d512ff1b3e53d72
tree44dee63360ed2e3ec1b7aedd469601f3fb8d1c4c
parent625d4bffc7afb96708e54457a3ec2ac7dda8f37b
parent7a7d6b1d0ca5d8ab66a75a30927398911cdec4bf
Merge "Back-port ag/2491664" into lmp-dev am: 41492a1e2c am: cbbdc18c7b am: c84dc8feb3 am: 4b029f8b0d am: 4c70016a94 am: 46592e90a9 am: 55b3b1f349 am: af26bae8b3 am: a1426f209c am: 2e690de9cf
am: 7a7d6b1d0c

Change-Id: I7a12d05b79c4a78e14fccf5288c9bea50ae4c4d9