OSDN Git Service

Resolved conflicts & merged commit '877123f5' into mnc-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Thu, 21 May 2015 18:40:04 +0000 (11:40 -0700)
committerAndre Eisenbach <eisenbach@google.com>
Thu, 21 May 2015 18:40:04 +0000 (11:40 -0700)
commitd702976418b4f560f8f6540d1cb7780cfa9f8d79
treede58e6c5c652f481ae1a11249a0e0b663935fa1f
parent08fc100f684f8a140d346742795a35c90ed87289
parent877123f5b9df90e7a71ea7b15997c521229decc1
Resolved conflicts & merged commit '877123f5' into mnc-dev-plus-aosp

Change-Id: Ie2961d5dc80c6f7e755ba184bd93f01aaffe44a2