tree faa8aff53756d4b3f5b0a6b5aa8fb5eb77001dd2
parent 9c56cf1a06a90995df2caba1d3142350136002b3
parent 0ecd0f2466470aba2724ef05a3d9401f6561b48a
author Brett Chabot <brettchabot@google.com> 1355442252 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1355442252 -0800

Merge "Switch to use ro.build.display.id instead of ro.build.id."