| commit | cb093b1cea7fe2ff2a2a69e54c24eb2ace53a8e1 | [log] [tgz] |
|---|---|---|
| author | Evgenii Stepanov <eugenis@google.com> | Fri Jun 19 14:22:25 2015 -0700 |
| committer | Evgenii Stepanov <eugenis@google.com> | Fri Jun 19 14:22:25 2015 -0700 |
| tree | 746c56dc5218fe87a45201cb48581ba66517a0cb | |
| parent | 5f41fc3d4d12cd5d1dd195c7369661e5b516c310 [diff] | |
| parent | bad5ebb619c3f7c004f4849af75bd73a5e5e3aa1 [diff] |
resolved conflicts for merge of bad5ebb6 to stage-aosp-master Change-Id: I6837884a3258f34baaf5a7d9ca6bbd6a3f3e62e5