tree f6bb4abbe19abc1a0ac27b361c6a524e3da1f740
parent 1cd768e07b88b00fdc13b99cc767ce22821ff8ae
parent 395d306c8c58f07dc2c95e261da0661b4a4c2355
author Chris Banes <chrisbanes@google.com> 1436205933 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436205933 +0000

am 395d306c: (-s ours) am 18f499d2: (-s ours) am f1add297: (-s ours) Add v22.2.0 API file DO NOT MERGE ANYWHERE

* commit '395d306c8c58f07dc2c95e261da0661b4a4c2355':
  Add v22.2.0 API file DO NOT MERGE ANYWHERE