| commit | 8575120faadbf605c69d3718e1f59eb39b949007 | [log] [tgz] |
|---|---|---|
| author | Jae Seo <jaeseo@google.com> | Wed Jul 06 07:55:48 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 06 07:55:48 2016 +0000 |
| tree | daad29cd2a01281788669042afa5bebfe40a7ddb | |
| parent | 61bb0a9ef4775281ca14a3ff7715cda1ff9e522c [diff] | |
| parent | 5f5bd8848c3374e6429a82840573526c637fffc7 [diff] |
resolve merge conflicts of 5b6c034 to stage-aosp-master am: 5f5bd8848c Change-Id: I4a2c518ff61f00d09efb92bd7da2e9bc477421f3