| commit | d7906a1a7417f19b136e139f3d1f7198930a919a | [log] [tgz] |
|---|---|---|
| author | Rich Slogar <rslogar@google.com> | Thu Apr 30 21:34:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 30 21:34:44 2015 +0000 |
| tree | 0b985f5038223a12d81f319efa5353736b7a97a7 | |
| parent | c1000a39655246170987dced51a85e94328d035f [diff] | |
| parent | 24863faa05dc8934f790e13f8cf153c0edb4a32a [diff] |
am 24863faa: Merge "resolved conflicts for merge of edf44562 to mnc-dev" into mnc-dev * commit '24863faa05dc8934f790e13f8cf153c0edb4a32a': docs: studio 1.2 updates