OSDN Git Service

Merge changes from topic 'dex' am: f665781c74 am: 8a4afd3dad
authorCalin Juravle <calin@google.com>
Wed, 29 Mar 2017 01:36:16 +0000 (01:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 01:36:16 +0000 (01:36 +0000)
commit455379b70a50510f950f90e21b470f6c59529654
tree3ce7a330c0eecea9d1a1c7bb6fbd34f00419cb90
parent66ebc6ad2c18891505b05188018ab8b132bf7358
parent5949d0dcdc240149cac7b1efef63aca80bab4a02
Merge changes from topic 'dex' am: f665781c74 am: 8a4afd3dad
am: 5949d0dcdc  -s ours

Change-Id: Ic85e62a9ad2a7c1bd04a70776ebeb816a67a4e72