OSDN Git Service

am 5d3acebd: resolved conflicts for merge of c8d000a1 to lmp-mr1-ub-dev
authorVladimir Marko <vmarko@google.com>
Sat, 6 Jun 2015 00:06:16 +0000 (00:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 6 Jun 2015 00:06:16 +0000 (00:06 +0000)
commit76e8509e457cbb361532b5ef64b5551f08843a3d
tree05195156ad2d516396d88c8356d4fc9916c089f1
parent6ff4f156f6f916e4fe70106788b992bfc474d117
parent5d3acebd1fe859cbf6fb3831815eb7f3c1f3e442
am 5d3acebd: resolved conflicts for merge of c8d000a1 to lmp-mr1-ub-dev

* commit '5d3acebd1fe859cbf6fb3831815eb7f3c1f3e442':
  Revert "Quick: Fix "select" pattern to update data used for GC maps. DO NOT MERGE"