| commit | a9f35e05a534253d1c4b00ccffdeca159e39ca06 | [log] [tgz] |
|---|---|---|
| author | Jae Seo <jaeseo@google.com> | Wed Jul 06 08:00:54 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 06 08:00:54 2016 +0000 |
| tree | 24f5b747f5b418dacea934aece9445b06a83d26e | |
| parent | 4f174386a67ca02aee866737a1de47e6e5dee00d [diff] | |
| parent | 8575120faadbf605c69d3718e1f59eb39b949007 [diff] |
resolve merge conflicts of 5b6c034 to stage-aosp-master am: 5f5bd8848c am: 8575120faa Change-Id: I31939710a2e8b2accc5445048bc6c0376d1371e6