| commit | 3ad4e29ac2f16084dcbe3cbcee7223e2607c049c | [log] [tgz] |
|---|---|---|
| author | Siva Velusamy <vsiva@google.com> | Mon Sep 14 11:56:51 2015 -0700 |
| committer | Siva Velusamy <vsiva@google.com> | Mon Sep 14 11:56:51 2015 -0700 |
| tree | 43d89f1088f36dc8fb502a31e6f11e7a4eda8d91 | |
| parent | 033ea23f59f78e253affbc0d2745083339ca1fd7 [diff] | |
| parent | b1ead6e2dea1b30c7b00009439ee26406e89890b [diff] |
resolved conflicts for b1ead6e2 to stage-aosp-master Change-Id: I86c4af2fece33e94cf7fd8f3301f05a3fcdb642e