OSDN Git Service

resolved conflicts for merge of 94871b94 to mnc-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Wed, 3 Jun 2015 18:54:49 +0000 (11:54 -0700)
committerNick Kralevich <nnk@google.com>
Wed, 3 Jun 2015 18:55:39 +0000 (11:55 -0700)
commit3125b3e97334eb5dcd6c0981f3dd0a6ab49e44e2
tree1c5b67d13e9dc7c6925d416a29486084e2dca085
parent25d9cff48a56c00335d220a87987cc8b39fd2935
parent94871b94efdb7be54b0bc388c3da02b2058eaf8c
resolved conflicts for merge of 94871b94 to mnc-dev-plus-aosp

Bug: 19608716
Change-Id: Ic3b44e97fb8731794e5bdaf57db072640cae0737