tree c15c643098bbf5eefad8a9f47fa48382a6f24570
parent 650615fb171f2eb31f5b3e893b2df3e378ad2b81
parent 756cbb248e0478247087d28f1fcb53931e49eb31
author Roshan Pius <rpius@google.com> 1472801554 +0000
committer android-build-merger <android-build-merger@google.com> 1472801554 +0000

Merge commit '3f3ed24' into stage-aosp-master am: e9b6029153
am: 756cbb248e

Change-Id: I8d6ad1bcd2c41553ced95c9f59e8a35889d24edf