OSDN Git Service

am f53d1a01: Merge "resolved conflicts for merge of c1edfc2c to master"
authorGabriel Peal <gpeal@google.com>
Tue, 25 Mar 2014 21:04:47 +0000 (14:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 21:04:47 +0000 (14:04 -0700)
commit522f513eaca133f17f951034e36316a1b94f2aac
treef6f93b444c5650e36ffd4d2ebf171313accd6006
parent993b9646d7f3bf47763d627f0d5e6b244f383070
parentf53d1a01972d04402b48476d6a8173285516edd3
am f53d1a01: Merge "resolved conflicts for merge of c1edfc2c to master"

* commit 'f53d1a01972d04402b48476d6a8173285516edd3':
  Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.