| commit | 33cb1ec2386e3d41c5c5eeff5a904dd13772aa93 | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Wed Sep 16 17:18:03 2015 +0000 |
| committer | Dan Austin <danielaustin@google.com> | Wed Sep 16 17:18:03 2015 +0000 |
| tree | fa3588c743c84675ea4d442f41c7a157df5cd523 | |
| parent | bd4e0384334f0d185edd5161fad89f662dd9b60c [diff] |
Revert "resolved conflicts for c82fcdda to stage-aosp-master" This reverts commit bd4e0384334f0d185edd5161fad89f662dd9b60c. Change-Id: I60d1bf66e4b5f1b9cce82748b5e93166077b79c6