commit | f9e57a8961494cb1144328dfcc2f6259cfc0b798 | [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 | 05231ed96db0860b3f8a507995826b06d52762c3 | |
parent | fa9612676150efc32b85bdd8f43404b178aed115 [diff] | |
parent | 12a06615580cf0bc953307ebd32400ea5c506236 [diff] |
resolve merge conflicts of 5b6c034 to stage-aosp-master am: 5f5bd8848c am: 8575120faa Change-Id: I31939710a2e8b2accc5445048bc6c0376d1371e6