| commit | 2a001e8bfe0255242740df7d9674408820f13627 | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Fri Aug 05 14:06:41 2016 -0700 |
| committer | Dan Willemsen <dwillemsen@google.com> | Fri Aug 05 15:14:34 2016 -0700 |
| tree | 1770f503ef872d61084f11918199644922a5f49c | |
| parent | 759d63a2f418734d11a25dab122d470675fd9359 [diff] | |
| parent | 0783d5fc28e78e875bed663eea8a5df77eddf571 [diff] |
resolve merge conflicts of 0783d5f to stage-aosp-master Change-Id: I4fe9c0391d6d41bae5fbbb0df6e00e264e87649f