| commit | f345c1f47bc7dd55bfe79452abd79398b82748e8 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Mon Jul 25 06:32:23 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 25 06:32:23 2016 +0000 |
| tree | 7a7349d8dac5e33cfca2096c818f7d6ce62541f3 | |
| parent | 5d795e95b72a7c76624000de378bcb343c12c4c9 [diff] | |
| parent | 93ce78f6b97f7cf01f40c875a1a6084ab2fab732 [diff] |
resolve merge conflicts of 75b79d3 to stage-aosp-master am: 21f67731bb am: 93ce78f6b9 Change-Id: Iae2e888a92bb75b87790069246368625b2931af8