| commit | 93ce78f6b97f7cf01f40c875a1a6084ab2fab732 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Mon Jul 25 06:22:49 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 25 06:22:49 2016 +0000 |
| tree | bca01d26244b8cc558af243a0d1cf16d7c33e7c4 | |
| parent | 528378d435602d58d6adf7e8ed41f07b190bfbbb [diff] | |
| parent | 21f67731bb5c0e399a78aa0330ce4738e70e106f [diff] |
resolve merge conflicts of 75b79d3 to stage-aosp-master am: 21f67731bb Change-Id: I8d823ce09258b4b6ee1ec9dece8a46794d6fe87a