tree e86d69309c86852f98a05a8bb7b0ba40daf26638
parent 9a6ed1829ae324ab22af614613ed7aa5969f2a31
parent 8c1246deaf536186661f93d31a317c938ff5d499
author Antonio Borneo <antonio.borneo@st.com> 1509062655 +0000
committer android-build-merger <android-build-merger@google.com> 1509062655 +0000

Merge changes Id3bbd918,I852b069e
am: 8c1246deaf

Change-Id: I3bef202530ff10465d9a3695337e6011cd3da243