OSDN Git Service

resolved conflicts for merge of 652c4854 to lmp-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Mon, 14 Jul 2014 21:35:20 +0000 (14:35 -0700)
committerNick Kralevich <nnk@google.com>
Mon, 14 Jul 2014 21:35:20 +0000 (14:35 -0700)
commit2ba30617596dfe91a75348f98f9716c0d72d7671
tree58332a2b4e44598f74b3dba3fdaeaced5e9441d2
parentfa050b96e15fe63675ab5a01c32ae3b0b5493f65
parent652c485467598240ecbb3a60516ad1140eddfab1
resolved conflicts for merge of 652c4854 to lmp-dev-plus-aosp