tree 0a832e3ac8beb59c1ca0dacb3d46799268ddc442
parent 3116391ecb75f35f801b5ff8018d4d0ec31d6044
parent ad938e637220de53b634c3f3ac8bce1a3d2d8623
author Linux Build Service Account <lnxbuild@localhost> 1373934926 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1373934926 -0700

Merge "display: define ANDROID_JELLYBEAN_MR1 outside TARGET_USES_QCOM_BSP"