| commit | 76414a8a77fdf4a2217f36cebbe953bf9e7c0972 | [log] [tgz] |
|---|---|---|
| author | Sergio Giro <sgiro@google.com> | Thu Oct 01 18:33:25 2015 +0000 |
| committer | Sergio Giro <sgiro@google.com> | Thu Oct 01 18:33:25 2015 +0000 |
| tree | 656d477d08b6bee52b221b800ae84439aa41960e | |
| parent | 8e5bb3ddf1ee4be88790778599a80e00958a68ac [diff] |
Revert "resolved conflicts for 70808827 to stage-aosp-master" This reverts commit 5cf2d5c9cc7d3a582154c93ebc4fd7fc7584ded0. Change-Id: Ifcffff034d4610c0d318cf67b0d98a28551c9605