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