| commit | de916a09d6fe2fc76e423022214ed9eac57e4f8c | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Tue Apr 29 10:15:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 29 10:15:15 2014 +0000 |
| tree | 77597abec510b68c7180a7d1b68f01ac5124d659 | |
| parent | 02061ed0a8aec6b039fcf3b2c783de79a50cad53 [diff] | |
| parent | 8f5ff15dc0428bbef5911776ae1f4d2730de4ed4 [diff] |
am 8f5ff15d: am 97e35de3: Merge "1.7 interoperability changes for FileLock" * commit '8f5ff15dc0428bbef5911776ae1f4d2730de4ed4': 1.7 interoperability changes for FileLock