| commit | d0274774ab3116a54f79bcfe52aa3cbcf700831b | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@google.com> | Thu Jun 23 08:43:13 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 23 08:43:13 2016 +0000 |
| tree | 1bfbded257abaafe163ea0a09326a8b24d712e40 | |
| parent | 12db6c3cf40c198277e518a78047d5eccb6305ac [diff] | |
| parent | 25d580912de82d0e359182b36b5c519f5a0d6766 [diff] |
resolve merge conflicts of ccd27b0 to stage-aosp-master am: 25d580912d Change-Id: I7afa0604b98b90256c47e806fbb8e11d9ac98594