| commit | 95d6237108e265799b542f82bcaa26a2033095ef | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Oct 09 19:29:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 09 19:29:31 2014 +0000 |
| tree | 166d51c2f0aa9418a82a7eb950144c50d68104c6 | |
| parent | a6d0ae33f6a04d0cb3dec18ad9a00cd602acc96a [diff] | |
| parent | 30236c19526340338cc9e318524c3431c131d4d7 [diff] |
am 30236c19: Merge "Use real API 21 constant." into lmp-dev * commit '30236c19526340338cc9e318524c3431c131d4d7': Use real API 21 constant.