commit | 76e8509e457cbb361532b5ef64b5551f08843a3d | [log] [tgz] |
---|---|---|
author | Vladimir Marko <vmarko@google.com> | Sat Jun 06 00:06:16 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 06 00:06:16 2015 +0000 |
tree | 05195156ad2d516396d88c8356d4fc9916c089f1 | |
parent | 6ff4f156f6f916e4fe70106788b992bfc474d117 [diff] | |
parent | 5d3acebd1fe859cbf6fb3831815eb7f3c1f3e442 [diff] |
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"