commit | ca846bfed49133b3bb474f63779635f4a424a5b3 | [log] [tgz] |
---|---|---|
author | Ying Wang <wangying@google.com> | Thu Jan 22 20:41:07 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 22 20:41:07 2015 +0000 |
tree | 28316a4abe0689af41c4c59ac5682fea83846ce2 | |
parent | 18a7b323c577c508bde0e298e253ea3c9512a284 [diff] | |
parent | 1faeaa6c89976a420f98e158e0015783b1cbf7f6 [diff] |
am 1faeaa6c: Merge "Check in System API file level 22." into lmp-mr1-dev * commit '1faeaa6c89976a420f98e158e0015783b1cbf7f6': Check in System API file level 22.