OSDN Git Service

resolved conflicts for merge of bced2b1c to mnc-dev-plus-aosp
authorNicolas Geoffray <ngeoffray@google.com>
Mon, 22 Jun 2015 14:06:52 +0000 (15:06 +0100)
committerNicolas Geoffray <ngeoffray@google.com>
Mon, 22 Jun 2015 14:06:52 +0000 (15:06 +0100)
commitcc92af4da2868adad56533db011c4566bb1c2c64
treec2864369616cfcf10becf42bb84e227d3ea4f904
parent7ff8a4ac9d2530e99b9621c54fa8b6e0e244b998
parentbced2b1c282422f339222445cfa0f5399458fc02
resolved conflicts for merge of bced2b1c to mnc-dev-plus-aosp

Change-Id: Iafc93afb99218df8d3abf867ca27374a75697e23