commit | 374712c54f5416e14523eec15456bb8b4372ffac | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Fri Oct 17 17:12:11 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 17 17:12:11 2014 +0000 |
tree | 1fa829493c9a70b38ea66987c01a8718d78ca934 | |
parent | 8e8b871cd6e0fae18e50c11329cb58360c2e165e [diff] | |
parent | 4a6a7524b398cabe144ccb02372ce8420c1b9780 [diff] |
Merge "Move up to API 21, Lollipop MR1." into lmp-mr1-dev