tree 0c2313167344569224b40101a355a2b0e2f59ebd
parent 5dbf5141444304f4772874ec2407b90d1291a4b2
parent c6e22ba1a135e336fce067ef3d5372dcaeb9499f
author Jorge Lucangeli Obes <jorgelo@google.com> 1469157286 -0400
committer Jorge Lucangeli Obes <jorgelo@google.com> 1469157286 -0400

resolve merge conflicts of c6e22ba to stage-aosp-master

Change-Id: I65550ff841d27f985a3ab8618ecdf4a3500fb0be