OSDN Git Service

resolved conflicts for merge of 53cb9daa to mnc-dev-plus-aosp
authorNicolas Geoffray <ngeoffray@google.com>
Wed, 24 Jun 2015 16:54:40 +0000 (17:54 +0100)
committerNicolas Geoffray <ngeoffray@google.com>
Wed, 24 Jun 2015 16:54:40 +0000 (17:54 +0100)
commite5ed385b52cd7ab081c27923a265df9544c6da69
tree71c82b32ebe225dca5682d9e29cf6c61c73a8c78
parentb2673eae8ea8ffc551093369f8322592f9d7bea6
parent53cb9daa2ff025d125d54f3c4f5444c7258d0153
resolved conflicts for merge of 53cb9daa to mnc-dev-plus-aosp

Change-Id: I4c205a5d152968d9076c21df7282ff643715a8a3