commit | e495d36423e2141ec487eddb5a5c1fc226ab47c8 | [log] [tgz] |
---|---|---|
author | Nicolas Geoffray <ngeoffray@google.com> | Thu Sep 18 16:00:46 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 18 16:00:46 2014 +0000 |
tree | 68ec67c519cfc3b4eb6e4bbefe2f2fa88a185c22 | |
parent | 1044144e2a5804c42928382526b65e492dacb498 [diff] | |
parent | f67bda68a579a8ac79f9d8f889e0233a8f94da55 [diff] |
am f67bda68: Merge "Fix a lint error and update a test after the phi fix." * commit 'f67bda68a579a8ac79f9d8f889e0233a8f94da55': Fix a lint error and update a test after the phi fix.