| commit | 92d512f6cf273d6d9e281dc362cc25cf8892b3f9 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Wed Sep 25 16:33:24 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 25 16:33:24 2013 -0700 |
| tree | 0676b29dc815078ecea084aa9d42a81aa7015b6f | |
| parent | 3c49c6ec49e0a4170ff7c9c74ac2e76b9b846ced [diff] | |
| parent | c612a133dcc3ffaa1a2172d2cac20bddbd5df284 [diff] |
am c612a133: Merge "Update capability.h" * commit 'c612a133dcc3ffaa1a2172d2cac20bddbd5df284': Update capability.h