tree 5fa15b78d8bd152a6d917bb8daa9a3504b1f98d3
parent 24f17f0b94341c84ca017598089bdb52e44e1f6a
parent 111a62edabe7342cca394b80ef3249105004ae02
author David 'Digit' Turner <digit@google.com> 1417684420 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417684421 +0000

Merge "resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp