tree 51bb2aa4ff78b0ebcdbe1cc474c76dd2d38d7a37
parent 9a0aa553ad9f6657cbbf0a182566c481e191e6b7
parent 487ae9b8dc3e08c1a830d519a801a07cd59c8f2b
author Andreas Gampe <agampe@google.com> 1415401426 -0800
committer Andreas Gampe <agampe@google.com> 1415402042 -0800

resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp

Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008