OSDN Git Service

Merge "resolved conflicts for merge of 0af3af03 to mnc-dev" into mnc-dev
authorCedric Ho <cedricho@google.com>
Mon, 27 Apr 2015 20:58:12 +0000 (20:58 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 27 Apr 2015 20:58:13 +0000 (20:58 +0000)
commit25d12e3f6a5ef15add0c0ccb560bb842283b98e2
treed6aa5e0b4b355d067b3b19b77773393223df3796
parentc0f705a81023f6491a6965c6c0d205f4bd3b3ee8
parent4e41767977257a2b949f95a7ecb9b7ab4d1cdf10
Merge "resolved conflicts for merge of 0af3af03 to mnc-dev" into mnc-dev