tree 3e230ff23653c0cb64bd6011700fd1246036beb3
parent 4dd25c554f8ad60fa9604236f3f71f97cc3e0ebe
parent 4a4974e04315e954c03d679027a53d8a3677a95d
author Santos Cordon <santoscordon@google.com> 1414697194 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414697194 +0000

Merge "Overlay swap capability after merge" into lmp-mr1-dev