OSDN Git Service

Merge "Fix some things."
authorDianne Hackborn <hackbod@google.com>
Thu, 13 Jun 2013 17:41:06 +0000 (17:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Jun 2013 17:41:06 +0000 (17:41 +0000)
commitcc6027e4c872e78614ae6691b12dab0f1dda4dd8
tree865723793203e4f0e8f5ca9fa374100e763aa705
parent33709d7f43dee89b703dbbddfaa79ec574f03e01
parent439e9bc85d854cec5ca89e8947a17693e84cb4ae
Merge "Fix some things."