OSDN Git Service

resolved conflicts for merge of 68000907 to lmp-mr1-dev
authorJustin Morey <jmorey@google.com>
Thu, 19 Mar 2015 02:27:17 +0000 (21:27 -0500)
committerJustin Morey <jmorey@google.com>
Thu, 19 Mar 2015 02:29:09 +0000 (21:29 -0500)
commit030b5493147d47a726e9f3e0e474772b29ad3111
tree7a84887a9e37ba524528f673730c2f06b69e3b5e
parentae61f50a680d4a8e91274b35305dc2e24959abbe
parent68000907e3411a6ef630c65748f23eaf366acf65
resolved conflicts for merge of 68000907 to lmp-mr1-dev

Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47