| commit | a541aa6559f314648153d0905445e3b256da3d42 | [log] [tgz] |
|---|---|---|
| author | Siva Velusamy <vsiva@google.com> | Mon Sep 14 17:14:28 2015 -0700 |
| committer | Siva Velusamy <vsiva@google.com> | Mon Sep 14 17:14:28 2015 -0700 |
| tree | 52169f23e356c2287dfcf0556955f72b434a3892 | |
| parent | 3ad4e29ac2f16084dcbe3cbcee7223e2607c049c [diff] | |
| parent | 3f9d7b0826d6389d89df7258fe04587f85f1aab1 [diff] |
resolved conflicts for 3f9d7b08 to stage-aosp-master Change-Id: I3857d3ebdece7db356adfbc9b4f2ff3b1fc25825