tree d1f855a1189863c33befddf6a2d9104f074aae9d
parent 566b949b18fa3690783de0998f52b90f6d61c0eb
parent 332674c241001552902f38ab9dd4f40beee1fb6f
author Yin-Chia Yeh <yinchiayeh@google.com> 1428358655 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> 1428358655 -0700

resolved conflicts for merge of 332674c2 to lmp-mr1-dev

Change-Id: Ide8ec418ee1e19141a35496af074a690ee2afcfc