tree b5eab883c95113edaf9b8ebc529ce52b8507c9b4
parent d62aeac391d16d4953a12120c0ff614ccde02a30
parent 7d08864492fbdfd9ace79d3f03537c583180c837
author Ying Wang <wangying@google.com> 1401555317 -0700
committer Ying Wang <wangying@google.com> 1401555317 -0700

resolved conflicts for merge of 7d088644 to klp-modular-dev-plus-aosp

Change-Id: Ib8e9574733170871e88bdc441597dc4130614535