| commit | 8f5ff15dc0428bbef5911776ae1f4d2730de4ed4 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Tue Apr 29 10:11:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 29 10:11:49 2014 +0000 |
| tree | 5f3d6ac2412346f939e63387bcb1c013664d00f7 | |
| parent | a545eb3c76903aa6ef26249535b0d2f843c85b71 [diff] | |
| parent | 97e35de30fcddd7eaa0d6eb7a100bcf9bdd824a1 [diff] |
am 97e35de3: Merge "1.7 interoperability changes for FileLock" * commit '97e35de30fcddd7eaa0d6eb7a100bcf9bdd824a1': 1.7 interoperability changes for FileLock