OSDN Git Service

resolved conflicts for merge of 9db7ede5 to mnc-dev-plus-aosp
authorMohamad Ayyash <mkayyash@google.com>
Thu, 25 Jun 2015 01:09:59 +0000 (18:09 -0700)
committerMohamad Ayyash <mkayyash@google.com>
Thu, 25 Jun 2015 01:09:59 +0000 (18:09 -0700)
commit9b71d6d6944bca206348cb0fff86f5971635b436
tree31801142fc73f8a127869ef6122394779a96dcf5
parent0b09e1c262ab331bb621490338133b5e0d14ff52
parent9db7ede5dea508d590cb8ba5fe864203bc1e789c
resolved conflicts for merge of 9db7ede5 to mnc-dev-plus-aosp