OSDN Git Service

am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc...
authorFilip Gruszczynski <gruszczy@google.com>
Mon, 1 Jun 2015 15:52:05 +0000 (15:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:52:05 +0000 (15:52 +0000)
commit21605b3395372b1ee1dd645bb8d9e50c7e7e9460
treeec97a50da9f1f0f42dedffb9a72b0f9f3affee93
parent07ec79d269bf565becb2eb096dc28c1bb953a4be
parent99bcc3eee23ed8bd15bd108d068d6f9f694e4393
am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev

* commit '99bcc3eee23ed8bd15bd108d068d6f9f694e4393':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""