OSDN Git Service

resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev
authorDan Sandler <dsandler@android.com>
Sat, 15 Aug 2015 22:33:29 +0000 (18:33 -0400)
committerDan Sandler <dsandler@android.com>
Sat, 15 Aug 2015 22:33:29 +0000 (18:33 -0400)
commit8c8387d235b780c4a78a54d8240fe1f5a17c6af5
tree5a1db3a7184e42a9e7de6cae65dd5cf24c80cadc
parent8dcda391c79e8c2fd20a87834f1f61645aa771ea
parent8ad3e81701a20169b3410a231302ce0c82f95100
resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev

Change-Id: I5b47fdbb8a9712c104f12c25b80063048849cebd