tree b1350343701dccd609de5b167199748145395b21
parent 17b6a39f04c291c6002a22ec60eecdea51f86170
parent 438443e742d9cfb91c1193144a3b41744ffad34b
author Ed Tam <etam@google.com> 1428968272 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428968272 +0000

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