OSDN Git Service

Manually merge commit 'bf03f2e' into stage-aosp-master
authorAdrien Schildknecht <adriens@google.com>
Sat, 3 Dec 2016 04:13:08 +0000 (04:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:13:08 +0000 (04:13 +0000)
commit298394ac6890e4f0d110645665be49bb0c3a8fc8
tree9763285b1a3e7bbac4f48d4c39f83cf078b5a2ad
parentbb4366201fc58b41b8f73321ca388e5b009ad64d
parenta083ba6a4860dfd084408986106bb4e32e176588
Manually merge commit 'bf03f2e' into stage-aosp-master
am: a083ba6a48

Change-Id: I62ac977e4352061f3d3b7aecbf7dcfbc6026d32a