tree c63bfdecc67428c27202c50fc320f634ab7a0210
parent a10263ed1f1532127a135943dce993443c5dca51
parent fc759204d63f0c82f187d99f58efa4821674ccb8
author Mohamad Ayyash <mkayyash@google.com> 1425512625 -0800
committer Mohamad Ayyash <mkayyash@google.com> 1425512625 -0800

resolved conflicts for merge of fc759204 to stage-aosp-master

Change-Id: Icf58e881286a66cb3ca4cb122fa8c11ec217fbab