| commit | f8d6a4ba8739e16e13ae0014efa099ec564939a7 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Mar 05 15:41:39 2015 -0800 |
| committer | Dan Albert <danalbert@google.com> | Thu Mar 05 15:41:39 2015 -0800 |
| tree | 3359c566008dcbe79e5553503e37a754fea16b1e | |
| parent | ecc20aafa6f3d272292e7b3577c99f2c127e590f [diff] | |
| parent | 701f9c2fd8d4e31c5ed3a51e4767d4aeb9b20c40 [diff] |
resolved conflicts for merge of 701f9c2f to stage-aosp-master Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1