OSDN Git Service

am 7ce565f3: (-s ours) am 75d958c4: Merge "Disable launching assist during setup...
authorMaurice Lam <yukl@google.com>
Thu, 27 Aug 2015 09:26:12 +0000 (09:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:26:12 +0000 (09:26 +0000)
commitd735e26d177e6e28d867d8ae824919fed845566e
tree715d547d2502de8d04de0ec12233b3183ce62c99
parentc8870b8158ff91a4e2ca4a88f60ad1b97b6cb431
parent7ce565f39b6865da739232f0a3f753a5fd6ec82c
am 7ce565f3: (-s ours) am 75d958c4: Merge "Disable launching assist during setup" into mnc-dev

* commit '7ce565f39b6865da739232f0a3f753a5fd6ec82c':