OSDN Git Service

Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev
authorDiego Perez <diegoperez@google.com>
Tue, 21 Jul 2015 15:41:08 +0000 (15:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 21 Jul 2015 15:41:12 +0000 (15:41 +0000)
commit66e6683193f6a1d071710ea8a39b02f5129fc505
tree035d01b67770308a8b94c7395b84bc43595203f0
parente99f20f5873c00b35f2407e28e06ff9119f85088
parentb9935889b1be2aac4a47d1acbf7547a832edf9f3
Merge "resolved conflicts for merge of 112d8a36 to mnc-dev" into mnc-dev