OSDN Git Service

resolved conflicts for merge of 7d595d15 to lmp-dev-plus-aosp
authorYing Wang <wangying@google.com>
Tue, 5 Aug 2014 21:29:12 +0000 (14:29 -0700)
committerYing Wang <wangying@google.com>
Tue, 5 Aug 2014 21:29:12 +0000 (14:29 -0700)
commit9aefee017b642d70f7cd541e49d22d9c5a98bd24
treec15caacba63aea9ada6a8f758cf7559371873482
parent7688a3c754ac48e726fe681ff9d6162275f15c6b
parent7d595d15d37d3fe924553daaf05e162bf4db8b3b
resolved conflicts for merge of 7d595d15 to lmp-dev-plus-aosp

Change-Id: I16e5d927ec4e944bee8fa4f87f0d0a83a8b194ba