Merge "getDisplayAttributes now returns an error code" into jb-mr1-dev
authorJesse Hall <jessehall@google.com>
Thu, 20 Sep 2012 21:13:09 +0000 (14:13 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 20 Sep 2012 21:13:10 +0000 (14:13 -0700)

Trivial merge