tree fa3588c743c84675ea4d442f41c7a157df5cd523
parent 9d46697e3bd1af0f7150703a0b6b3ab17fa630c3
parent 33cb1ec2386e3d41c5c5eeff5a904dd13772aa93
author Dan Austin <danielaustin@google.com> 1442423984 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1442423984 +0000

Merge "Revert "resolved conflicts for c82fcdda to stage-aosp-master"" into stage-aosp-master