| commit | e0391cbec2241a25e56f8c26742f8bcef0ac4097 | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Tue Jan 13 21:20:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 13 21:20:49 2015 +0000 |
| tree | 9f17d5eded1f6f4d43469edca87753cc3d45917e | |
| parent | c339f2c78eb6656995c3fd21413643676297ce91 [diff] | |
| parent | 4ea620a6cf0b07de1a12aec4e23c73ec35d457bb [diff] |
am 4ea620a6: am ca38fcc9: Merge "Follow framework API additions for mock classes" into lmp-mr1-dev * commit '4ea620a6cf0b07de1a12aec4e23c73ec35d457bb': Follow framework API additions for mock classes