OSDN Git Service

resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 25 Jul 2011 19:08:19 +0000 (12:08 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Mon, 25 Jul 2011 19:08:19 +0000 (12:08 -0700)
commit476ceb890ad6c2aa25f644b2346fdf6c36e81867
tree62a3555429c3caf6d6220df764adf91a9ee9b991
parentc2263c21487c83836e33af26f9a65f661844b46b
parente164ef47816c781b989d525f637ec3c0c03cca81
resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp

Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9