| commit | 18c2cc68e8ddd3c2a2769b3c06336606b5ed1f6a | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Wed Sep 25 16:35:33 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 25 16:35:33 2013 -0700 |
| tree | 15f739f063fab76f4298adb3b839abe5f7b6b364 | |
| parent | 67e34826d8dfe02cb61bc282f1e49e860b50e395 [diff] | |
| parent | 92d512f6cf273d6d9e281dc362cc25cf8892b3f9 [diff] |
am 92d512f6: am c612a133: Merge "Update capability.h" * commit '92d512f6cf273d6d9e281dc362cc25cf8892b3f9': Update capability.h