OSDN Git Service

resolved conflicts for merge of 901d792c to mnc-dev-plus-aosp
authorNick Kralevich <nnk@google.com>
Mon, 11 May 2015 18:29:43 +0000 (11:29 -0700)
committerNick Kralevich <nnk@google.com>
Mon, 11 May 2015 18:29:43 +0000 (11:29 -0700)
commitf29e787611a91533a904ab640df80c1643a0adc7
tree97f1e71f01c1ecd3495e9b5edf65a3124d58ddc7
parent1c069641b40a3c8e535e20e06abafacc9c62549c
parent901d792cbfa65915b9cdf79fcbb4055eb0f29282
resolved conflicts for merge of 901d792c to mnc-dev-plus-aosp

Change-Id: I63fbc397ba28c832857bf7e27e8f1798e789a6e1