tree 595696706496db1a6cf54dd81b6289b4be90c5d7
parent ed61958a254deb6299b907ecb079ebe15da339c3
author Jason Sams <jsams@google.com> 1404336725 -0700
committer Jason Sams <jsams@google.com> 1404336744 -0700

Resolve conflicts with AOSP.

Change-Id: I2f1afdb83dcfc9078df5d3c2f13abacb6504d73d