Merge goog/master@c8da37c into stage-aosp-master. am: 38365a1634 am: e1fb5fe7df
authorMika Isojrvi <misojarvi@google.com>
Thu, 16 Jun 2016 14:57:27 +0000 (14:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 14:57:27 +0000 (14:57 +0000)
commitdd0641f5839257aab0eae39203f5a90db9319cf3
tree8ae62d9e2ce600b298dc181dc810d56965f99dc5
parentc8da37c8c21a1d3266b2b3076b2beeaaf553b98c
parent82d89acd57edc838830949c6ea8a6f427ad94595
Merge goog/master@c8da37c into stage-aosp- am: 38365a1634 am: e1fb5fe7df
am: 82d89acd57

Change-Id: I4776d3dc8423501fea804eccb30713e721a3a7e5