Merge "Minor API fixes."
authorXavier Ducrohet <xav@android.com>
Fri, 15 Mar 2013 20:57:39 +0000 (20:57 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 15 Mar 2013 20:57:39 +0000 (20:57 +0000)
commite7359ead5b01d2f9ffc4510624faa9062887b83c
tree89d2312a830294b76fb41cb96132fc66d9bf9516
parentb82b68da4b48fc5506fc60d093bff757af6c7327
parente645f16a2257046080dfb768e3305705f402aafa
Merge "Minor API fixes."