tree caa4710856a2f74c9eed75f13f3ddc10e432a600
parent 018c27eda89b54e59e6c043ea2986c6e39ec2ee0
parent cfe535ef9fe08ffceef826f6a0f1ba281528843a
author Elliott Hughes <enh@google.com> 1330711878 -0800
committer Elliott Hughes <enh@google.com> 1330711878 -0800

resolved conflicts for merge of cfe535ef to stage-aosp-master

Change-Id: I21a1dd41503518e75892180c14f1ce79102772ad