| commit | b52bf33c66f0598c162ce080209769f03c1e9712 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jun 27 09:54:25 2016 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Jun 27 09:54:25 2016 -0700 |
| tree | b32270904cd5b25d0fd85a87fbb070b13e439d60 | |
| parent | add3cf608ef5ee25576511dc930968444ad4cce6 [diff] | |
| parent | b4a3849039ec0313b073c0c3c2193701bb1c0164 [diff] |
resolve merge conflicts of 54c1219 to stage-aosp-master Change-Id: I4b3b2a8690cfe147929fd096de380a9d4b79f1ec