OSDN Git Service

resolved conflicts for merge of 04bf8bdf to mnc-dev-plus-aosp
authorMohamad Ayyash <mkayyash@google.com>
Thu, 25 Jun 2015 01:05:03 +0000 (18:05 -0700)
committerMohamad Ayyash <mkayyash@google.com>
Thu, 25 Jun 2015 01:05:03 +0000 (18:05 -0700)
commit0b09e1c262ab331bb621490338133b5e0d14ff52
tree31801142fc73f8a127869ef6122394779a96dcf5
parentae4151b3c763898a2144b8045e897d3e7ef815f0
parent04bf8bdfd19bd671cf53ac38f17864bfdab20e05
resolved conflicts for merge of 04bf8bdf to mnc-dev-plus-aosp