| commit | 4ea620a6cf0b07de1a12aec4e23c73ec35d457bb | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Tue Jan 13 19:11:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 13 19:11:51 2015 +0000 |
| tree | b6f26be045f3c3916848a0f545051d4713cb65a1 | |
| parent | 078419a8d7864b3288011a0f0cec3b1d15021470 [diff] | |
| parent | ca38fcc99d45bd75061606aac8f9e493e0d021b4 [diff] |
am ca38fcc9: Merge "Follow framework API additions for mock classes" into lmp-mr1-dev * commit 'ca38fcc99d45bd75061606aac8f9e493e0d021b4': Follow framework API additions for mock classes