| commit | d7ba5795bed76d2b56be2ac2f1d548b90df162d7 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Fri Aug 21 23:02:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 21 23:02:42 2015 +0000 |
| tree | 016c7ac6df88ec7b1ae561fc1bad2fa0552e1dd0 | |
| parent | 1d4d5a6587c8370f22686823d806d361eb6945fe [diff] | |
| parent | 3954d39547c2580e712c0213681b488bf0eb2714 [diff] |
am 3954d395: resolved conflicts for merge of da1173f4 to mnc-dr-dev-plus-aosp * commit '3954d39547c2580e712c0213681b488bf0eb2714': Don't make bad RS API level recommendations.