OSDN Git Service

am 24863faa: Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev
authorRich Slogar <rslogar@google.com>
Thu, 30 Apr 2015 21:34:44 +0000 (21:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Apr 2015 21:34:44 +0000 (21:34 +0000)
commitd7906a1a7417f19b136e139f3d1f7198930a919a
tree0b985f5038223a12d81f319efa5353736b7a97a7
parentc1000a39655246170987dced51a85e94328d035f
parent24863faa05dc8934f790e13f8cf153c0edb4a32a
am 24863faa: Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev

* commit '24863faa05dc8934f790e13f8cf153c0edb4a32a':
  docs: studio 1.2 updates