diff options
| author | Chris Craik <ccraik@google.com> | 2013-02-13 10:25:12 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2013-02-13 16:33:53 -0800 |
| commit | 3d850df9b482ccd2ec42f28d8fba3a05bc381c96 (patch) | |
| tree | 1cac82d6249ec652a6ad59d04382ca1fc0082307 /tests/DynamicCodeLoggerIntegrationTests/src | |
| parent | ca42382f36561d0d368fdd6a9601fb7a81198c1d (diff) | |
Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
This reverts commit 6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to a2cd828b749c444d55c2c41c7dbb85088ff94b9f.
Conflicts:
packages/SystemUI/res/values-sv/strings.xml
Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src')
0 files changed, 0 insertions, 0 deletions