OSDN Git Service

resolved conflicts for merge of cfe535ef to stage-aosp-master
authorElliott Hughes <enh@google.com>
Fri, 2 Mar 2012 18:11:18 +0000 (10:11 -0800)
committerElliott Hughes <enh@google.com>
Fri, 2 Mar 2012 18:11:18 +0000 (10:11 -0800)
commita480cf930f31ab404e7efe66259427a53d72fa2b
treecaa4710856a2f74c9eed75f13f3ddc10e432a600
parent018c27eda89b54e59e6c043ea2986c6e39ec2ee0
parentcfe535ef9fe08ffceef826f6a0f1ba281528843a
resolved conflicts for merge of cfe535ef to stage-aosp-master

Change-Id: I21a1dd41503518e75892180c14f1ce79102772ad